Drop the expand property

The hexpand and vexpand properties are sufficient.

diff --git a/demos/gtk-demo/demo.ui b/demos/gtk-demo/demo.ui
index b020232523eca851500e778aec3be91058fd40e5..bc829396f59e81a7ed4c860d594e0362635cb96e 100644 (file)
--- a/demos/gtk-demo/demo.ui
+++ b/demos/gtk-demo/demo.ui
@@ -167,7 +167,8 @@
         <child>
           <object class="GtkScrolledWindow" id="scrolledwindow1">
             <property name="shadow-type">in</property>
-            <property name="expand">1</property>
+            <property name="hexpand">1</property>
+            <property name="vexpand">1</property>
             <child>
               <object class="GtkTreeView" id="treeview1">
                 <property name="model">liststore1</property>

diff --git a/demos/gtk-demo/main.ui b/demos/gtk-demo/main.ui
index f4849a6a08a3a15463e2e23848e0dd716dae76de..369660c39bcb682d0fa79eaa33e8aa1176595d6b 100644 (file)
--- a/demos/gtk-demo/main.ui
+++ b/demos/gtk-demo/main.ui
@@ -103,7 +103,8 @@
             <property name="scrollable">1</property>
             <property name="enable-popup">1</property>
             <property name="show-border">0</property>
-            <property name="expand">1</property>
+            <property name="hexpand">1</property>
+            <property name="vexpand">1</property>
             <child>
               <object class="GtkNotebookPage">
                 <property name="tab-expand">1</property>

diff --git a/demos/icon-browser/window.ui b/demos/icon-browser/window.ui
index 0aa0c48d4f94e9ea12ac8dea9d684b88f9b25df3..95b8936f7ceb12d465c51ceef045e14fa759bc07 100644 (file)
--- a/demos/icon-browser/window.ui
+++ b/demos/icon-browser/window.ui
@@ -77,7 +77,8 @@
             </child>
             <child>
               <object class="GtkScrolledWindow" id="sw">
-                <property name="expand">1</property>
+                <property name="hexpand">1</property>
+                <property name="vexpand">1</property>
                 <property name="hscrollbar-policy">never</property>
                 <child>
                   <object class="GtkIconView" id="list">

diff --git a/demos/node-editor/node-editor-window.ui b/demos/node-editor/node-editor-window.ui
index 337ef5995c901ba20959ff0a4e2ec1abb91407fb..f30532f73144423c47573a306003695794b90636 100644 (file)
--- a/demos/node-editor/node-editor-window.ui
+++ b/demos/node-editor/node-editor-window.ui
@@ -133,7 +133,8 @@
         <child>
           <object class="GtkScrolledWindow">
             <property name="hscrollbar-policy">never</property>
-            <property name="expand">1</property>
+            <property name="hexpand">1</property>
+            <property name="vexpand">1</property>
             <child>
               <object class="GtkTextView" id="text_view">
                 <property name="wrap-mode">word</property>
@@ -156,7 +157,8 @@
           <object class="GtkBox">
             <child>
               <object class="GtkScrolledWindow">
-                <property name="expand">1</property>
+                <property name="hexpand">1</property>
+                <property name="vexpand">1</property>
                 <property name="min-content-height">100</property>
                 <property name="min-content-width">100</property>
                 <child>

diff --git a/demos/widget-factory/widget-factory.ui b/demos/widget-factory/widget-factory.ui
index b2766d46eed4ac74f08ae3a5ab5b0e259f719c72..f323237baf3c5cd0b61732c02db5d59f5bfc1eed 100644 (file)
--- a/demos/widget-factory/widget-factory.ui
+++ b/demos/widget-factory/widget-factory.ui
@@ -1909,10 +1909,12 @@ microphone-sensitivity-medium-symbolic</property>
                                 <child>
                                   <object class="GtkBox">
                                     <property name="spacing">10</property>
-                                    <property name="expand">1</property>
+                                    <property name="hexpand">1</property>
+                                    <property name="vexpand">1</property>
                                     <child>
                                       <object class="GtkFrame" id="panedframe1">
-                                        <property name="expand">1</property>
+                                        <property name="hexpand">1</property>
+                                        <property name="vexpand">1</property>
                                         <child>
                                           <object class="GtkPaned">
                                             <style>
@@ -1934,7 +1936,8 @@ microphone-sensitivity-medium-symbolic</property>
                                     </child>
                                     <child>
                                       <object class="GtkFrame" id="panedframe2">
-                                        <property name="expand">1</property>
+                                        <property name="hexpand">1</property>
+                                        <property name="vexpand">1</property>
                                         <child>
                                           <object class="GtkPaned">
                                             <property name="orientation">vertical</property>

diff --git a/gtk/gtkshortcutswindow.c b/gtk/gtkshortcutswindow.c
index 7f575032e097dca284903e19721c3762f9ea43b7..2e252054a7c52083d1af631b9ff6039784ad5801 100644 (file)
--- a/gtk/gtkshortcutswindow.c
+++ b/gtk/gtkshortcutswindow.c
@@ -905,7 +905,8 @@ gtk_shortcuts_window_init (GtkShortcutsWindow *self)
                                          GTK_WIDGET (self));
 
   priv->stack = g_object_new (GTK_TYPE_STACK,
-                              "expand", TRUE,
+                              "hexpand", TRUE,
+                              "vexpand", TRUE,
                               "homogeneous", TRUE,
                               "transition-type", GTK_STACK_TRANSITION_TYPE_CROSSFADE,
                               NULL);

diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index 944e6f303ca7265ba87acc002d8d6eb04d437f64..184c4b617bad85a288e8fd3c71c9e60b814fb8d3 100644 (file)
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -555,7 +555,6 @@ enum {
   PROP_VEXPAND,
   PROP_HEXPAND_SET,
   PROP_VEXPAND_SET,
-  PROP_EXPAND,
   PROP_SCALE_FACTOR,
   PROP_CSS_NAME,
   PROP_CSS_CLASSES,
@@ -1254,18 +1253,6 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                             FALSE,
                             GTK_PARAM_READWRITE|G_PARAM_EXPLICIT_NOTIFY);
 
-  /**
-   * GtkWidget:expand:
-   *
-   * Whether to expand in both directions. Setting this sets both #GtkWidget:hexpand and #GtkWidget:vexpand
-   */
-  widget_props[PROP_EXPAND] =
-      g_param_spec_boolean ("expand",
-                            P_("Expand Both"),
-                            P_("Whether widget wants to expand in both directions"),
-                            FALSE,
-                            GTK_PARAM_READWRITE);
-
   /**
    * GtkWidget:opacity:
    *
@@ -1878,12 +1865,6 @@ gtk_widget_set_property (GObject         *object,
     case PROP_VEXPAND_SET:
       gtk_widget_set_vexpand_set (widget, g_value_get_boolean (value));
       break;
-    case PROP_EXPAND:
-      g_object_freeze_notify (G_OBJECT (widget));
-      gtk_widget_set_hexpand (widget, g_value_get_boolean (value));
-      gtk_widget_set_vexpand (widget, g_value_get_boolean (value));
-      g_object_thaw_notify (G_OBJECT (widget));
-      break;
     case PROP_OPACITY:
       gtk_widget_set_opacity (widget, g_value_get_double (value));
       break;
@@ -2026,11 +2007,6 @@ gtk_widget_get_property (GObject         *object,
     case PROP_VEXPAND_SET:
       g_value_set_boolean (value, gtk_widget_get_vexpand_set (widget));
       break;
-    case PROP_EXPAND:
-      g_value_set_boolean (value,
-                           gtk_widget_get_hexpand (widget) &&
-                           gtk_widget_get_vexpand (widget));
-      break;
     case PROP_OPACITY:
       g_value_set_double (value, gtk_widget_get_opacity (widget));
       break;
@@ -8442,14 +8418,11 @@ gtk_widget_set_expand (GtkWidget     *widget,
   GtkWidgetPrivate *priv = gtk_widget_get_instance_private (widget);
   gint expand_prop;
   gint expand_set_prop;
-  gboolean was_both;
 
   g_return_if_fail (GTK_IS_WIDGET (widget));
 
   expand = expand != FALSE;
 
-  was_both = priv->hexpand && priv->vexpand;
-
   if (orientation == GTK_ORIENTATION_HORIZONTAL)
     {
       if (priv->hexpand_set &&
@@ -8480,8 +8453,6 @@ gtk_widget_set_expand (GtkWidget     *widget,
   g_object_freeze_notify (G_OBJECT (widget));
   g_object_notify_by_pspec (G_OBJECT (widget), widget_props[expand_prop]);
   g_object_notify_by_pspec (G_OBJECT (widget), widget_props[expand_set_prop]);
-  if (was_both != (priv->hexpand && priv->vexpand))
-    g_object_notify_by_pspec (G_OBJECT (widget), widget_props[PROP_EXPAND]);
   g_object_thaw_notify (G_OBJECT (widget));
 }
 

diff --git a/gtk/inspector/actions.ui b/gtk/inspector/actions.ui
index 7ec69d18f2384b714f45fec5d1ad35cdd78c8ba5..6ca81771ed7dccfce14e8f1c9b44027dd29d7b16 100644 (file)
--- a/gtk/inspector/actions.ui
+++ b/gtk/inspector/actions.ui
@@ -54,7 +54,8 @@
     </child>
     <child>
       <object class="GtkScrolledWindow">
-        <property name="expand">1</property>
+        <property name="hexpand">1</property>
+        <property name="vexpand">1</property>
         <property name="hscrollbar-policy">never</property>
         <child>
           <object class="GtkListBox" id="list">

diff --git a/gtk/inspector/css-editor.ui b/gtk/inspector/css-editor.ui
index 1425e9f4479dbf8471739da605dc74eb86722aac..5996ece5db61469923b7f54e6c73d44917393900 100644 (file)
--- a/gtk/inspector/css-editor.ui
+++ b/gtk/inspector/css-editor.ui
@@ -45,7 +45,8 @@
     <child>
       <object class="GtkScrolledWindow">
         <property name="hscrollbar-policy">never</property>
-        <property name="expand">1</property>
+        <property name="hexpand">1</property>
+        <property name="vexpand">1</property>
         <child>
           <object class="GtkTextView" id="view">
             <property name="buffer">text</property>

diff --git a/gtk/inspector/css-node-tree.ui b/gtk/inspector/css-node-tree.ui
index f05edfc5d678cc64f0cb10e376bf3429532ce242..7c311f3d621ecd7a6e2bb4aaee1ce41516b01d61 100644 (file)
--- a/gtk/inspector/css-node-tree.ui
+++ b/gtk/inspector/css-node-tree.ui
@@ -15,7 +15,8 @@
         <property name="position">400</property>
         <child>
           <object class="GtkScrolledWindow">
-            <property name="expand">1</property>
+            <property name="hexpand">1</property>
+            <property name="vexpand">1</property>
             <property name="min-content-height">100</property>
             <child>
               <object class="GtkTreeView" id="node_tree">

diff --git a/gtk/inspector/data-list.ui b/gtk/inspector/data-list.ui
index fe2fe2d53b8722def2e241ecac0c5d6183ed6ac0..081bbb1fc93beed72f19e76192709572aace8b73 100644 (file)
--- a/gtk/inspector/data-list.ui
+++ b/gtk/inspector/data-list.ui
@@ -23,7 +23,8 @@
     </child>
     <child>
       <object class="GtkScrolledWindow">
-        <property name="expand">1</property>
+        <property name="hexpand">1</property>
+        <property name="vexpand">1</property>
         <property name="vscrollbar-policy">always</property>
         <child>
           <object class="GtkTreeView" id="view"/>

diff --git a/gtk/inspector/magnifier.ui b/gtk/inspector/magnifier.ui
index 27d72e9ba1c167056a1e34ed5ecc130984397664..b60e5e7af189dfa63ce50eb1dac4fd7b229f81b1 100644 (file)
--- a/gtk/inspector/magnifier.ui
+++ b/gtk/inspector/magnifier.ui
@@ -3,7 +3,8 @@
     <property name="orientation">vertical</property>
     <child>
       <object class="GtkScrolledWindow">
-        <property name="expand">1</property>
+        <property name="hexpand">1</property>
+        <property name="vexpand">1</property>
         <child>
           <object class="GtkMagnifier" id="magnifier">
             <property name="visible">True</property>

diff --git a/gtk/inspector/menu.ui b/gtk/inspector/menu.ui
index 42351b13682e00f126aeca42943eb12bd0050a77..2546256e8426b7b9982a7fcf01fc6e79aa4460de 100644 (file)
--- a/gtk/inspector/menu.ui
+++ b/gtk/inspector/menu.ui
@@ -12,7 +12,8 @@
     <property name="orientation">vertical</property>
     <child>
       <object class="GtkScrolledWindow">
-        <property name="expand">1</property>
+        <property name="hexpand">1</property>
+        <property name="vexpand">1</property>
         <property name="vscrollbar-policy">always</property>
         <child>
           <object class="GtkTreeView">

diff --git a/gtk/inspector/object-tree.ui b/gtk/inspector/object-tree.ui
index 530e2b52d236d96e79dff5303fd6c8d3aac5782c..afe97821fa12ef083b75a235e20de33c1a5e7a2a 100644 (file)
--- a/gtk/inspector/object-tree.ui
+++ b/gtk/inspector/object-tree.ui
@@ -37,7 +37,8 @@
     <child>
       <object class="GtkScrolledWindow">
         <property name="hscrollbar-policy">never</property>
-        <property name="expand">1</property>
+        <property name="hexpand">1</property>
+        <property name="vexpand">1</property>
         <child>
           <object class="GtkListBox" id="list">
             <signal name="row-activated" handler="on_row_activated"/>

diff --git a/gtk/inspector/prop-editor.c b/gtk/inspector/prop-editor.c
index 1a88b38dbe3e22256564cade0357cd1fb217dc9f..438d719948fec412c943c540e0f920ef176eadac 100644 (file)
--- a/gtk/inspector/prop-editor.c
+++ b/gtk/inspector/prop-editor.c
@@ -950,7 +950,8 @@ property_editor (GObject                *object,
         sw = gtk_scrolled_window_new (NULL, NULL);
         gtk_container_add (GTK_CONTAINER (popover), sw);
         g_object_set (sw,
-                      "expand", TRUE,
+                      "hexpand", TRUE,
+                      "vexpand", TRUE,
                       "hscrollbar-policy", GTK_POLICY_NEVER,
                       "vscrollbar-policy", GTK_POLICY_NEVER,
                       NULL);
@@ -1017,7 +1018,8 @@ property_editor (GObject                *object,
       sw = gtk_scrolled_window_new (NULL, NULL);
       gtk_container_add (GTK_CONTAINER (popover), sw);
       g_object_set (sw,
-                    "expand", TRUE,
+                    "hexpand", TRUE,
+                    "vexpand", TRUE,
                     "hscrollbar-policy", GTK_POLICY_NEVER,
                     "vscrollbar-policy", GTK_POLICY_NEVER,
                       NULL);

diff --git a/gtk/inspector/prop-list.ui b/gtk/inspector/prop-list.ui
index f1898cf5b502bc606188a82b2bd34c71bd2be45f..73ed60f5eb9c49c4d592674d44a0eaa0eac37505 100644 (file)
--- a/gtk/inspector/prop-list.ui
+++ b/gtk/inspector/prop-list.ui
@@ -80,7 +80,8 @@
         </child>
         <child>
           <object class="GtkScrolledWindow">
-            <property name="expand">1</property>
+            <property name="hexpand">1</property>
+            <property name="vexpand">1</property>
             <property name="hscrollbar-policy">never</property>
             <child>
               <object class="GtkListBox" id="list2">

diff --git a/gtk/inspector/recorder.ui b/gtk/inspector/recorder.ui
index cd48428a02c15c034a7566e5f72a2859d24fc766..e9bd32c659c0d0f96432e13c95cd46291fd9130b 100644 (file)
--- a/gtk/inspector/recorder.ui
+++ b/gtk/inspector/recorder.ui
@@ -137,7 +137,8 @@
                 </child>
                 <child>
                   <object class="GtkPicture" id="render_node_view">
-                    <property name="expand">1</property>
+                    <property name="hexpand">1</property>
+                    <property name="vexpand">1</property>
                   </object>
                 </child>
               </object>

diff --git a/gtk/inspector/resource-list.ui b/gtk/inspector/resource-list.ui
index 7493d98f3ab55b5ee17dd79c096f99c419103eb3..dabe1cae78a7dd9331ac08adf8d8622f92100f8c 100644 (file)
--- a/gtk/inspector/resource-list.ui
+++ b/gtk/inspector/resource-list.ui
@@ -50,7 +50,8 @@
                 </child>
                 <child>
                   <object class="GtkScrolledWindow">
-                    <property name="expand">1</property>
+                    <property name="hexpand">1</property>
+                    <property name="vexpand">1</property>
                     <property name="hscrollbar-policy">never</property>
                     <child>
                       <object class="GtkTreeView" id="tree">
@@ -198,7 +199,8 @@
                         <property name="name">text</property>
                         <property name="child">
                           <object class="GtkScrolledWindow">
-                            <property name="expand">1</property>
+                            <property name="hexpand">1</property>
+                            <property name="vexpand">1</property>
                             <property name="shadow-type">in</property>
                             <style>
                               <class name="view"/>
@@ -218,7 +220,8 @@
                         <property name="name">image</property>
                         <property name="child">
                           <object class="GtkScrolledWindow">
-                            <property name="expand">1</property>
+                            <property name="hexpand">1</property>
+                            <property name="vexpand">1</property>
                             <property name="shadow-type">in</property>
                             <style>
                               <class name="view"/>

diff --git a/gtk/inspector/statistics.ui b/gtk/inspector/statistics.ui
index e29917950d86af81eca7279a2aa404f90da2b6de..c835f14d627560c4f3775734f2acd8a275dc8ada 100644 (file)
--- a/gtk/inspector/statistics.ui
+++ b/gtk/inspector/statistics.ui
@@ -33,7 +33,8 @@
                 </child>
                 <child>
                   <object class="GtkScrolledWindow">
-                    <property name="expand">1</property>
+                    <property name="hexpand">1</property>
+                    <property name="vexpand">1</property>
                     <property name="vscrollbar-policy">always</property>
                     <child>
                       <object class="GtkTreeView" id="view">

diff --git a/gtk/ui/gtkcolorchooserdialog.ui b/gtk/ui/gtkcolorchooserdialog.ui
index 403775db40e32d1683202606cab950c7d25b2a1e..8daa0d11c054434dc7c7bc55a61759e8315034c1 100644 (file)
--- a/gtk/ui/gtkcolorchooserdialog.ui
+++ b/gtk/ui/gtkcolorchooserdialog.ui
@@ -13,7 +13,8 @@
           <object class="GtkColorChooserWidget" id="chooser">
             <property name="margin">5</property>
             <property name="rgba">rgb(255,255,255)</property>
-            <property name="expand">1</property>
+            <property name="hexpand">1</property>
+            <property name="vexpand">1</property>
             <signal name="color-activated" handler="color_activated_cb" swapped="no"/>
             <signal name="notify::rgba" handler="propagate_notify" swapped="no"/>
             <signal name="notify::show-editor" handler="propagate_notify" swapped="no"/>

diff --git a/gtk/ui/gtkfilechooserdialog.ui b/gtk/ui/gtkfilechooserdialog.ui
index 425dab20e6b194f273f05df46dbd684a62aa8b52..010e725bc98eb0f5c8975df035628be138dc06d4 100644 (file)
--- a/gtk/ui/gtkfilechooserdialog.ui
+++ b/gtk/ui/gtkfilechooserdialog.ui
@@ -16,7 +16,8 @@
         </child>
         <child>
           <object class="GtkFileChooserWidget" id="widget">
-            <property name="expand">1</property>
+            <property name="hexpand">1</property>
+            <property name="vexpand">1</property>
             <signal name="file-activated" handler="file_chooser_widget_file_activated" swapped="no"/>
             <signal name="response-requested" handler="file_chooser_widget_response_requested" swapped="no"/>
             <signal name="selection-changed" handler="file_chooser_widget_selection_changed" swapped="no"/>

diff --git a/gtk/ui/gtkfilechooserwidget.ui b/gtk/ui/gtkfilechooserwidget.ui
index 4253c819a3303900f1a91a2d885f4c5db20ab111..a713c09693ad2d0ab579ba55acb3f3686780898e 100644 (file)
--- a/gtk/ui/gtkfilechooserwidget.ui
+++ b/gtk/ui/gtkfilechooserwidget.ui
@@ -115,7 +115,8 @@
                         <child>
                           <object class="GtkStack" id="browse_files_stack">
                             <property name="transition-type">crossfade</property>
-                            <property name="expand">1</property>
+                            <property name="hexpand">1</property>
+                            <property name="vexpand">1</property>
                             <style>
                               <class name="view"/>
                             </style>

diff --git a/testsuite/gtk/notify.c b/testsuite/gtk/notify.c
index 9fb04fb89fb5abe34c1aad73570e44320006f7a6..9b6dabac93a8e8c134e3f8e1a21e93177a98c301 100644 (file)
--- a/testsuite/gtk/notify.c
+++ b/testsuite/gtk/notify.c
@@ -497,9 +497,7 @@ test_type (gconstpointer data)
            g_str_equal (pspec->name, "is-focus") ||
            g_str_equal (pspec->name, "margin") ||
            g_str_equal (pspec->name, "hexpand") ||
-           g_str_equal (pspec->name, "vexpand") ||
-           g_str_equal (pspec->name, "expand")
-            ))
+           g_str_equal (pspec->name, "vexpand")))
        continue;
 
       if (pspec->owner_type == GTK_TYPE_ENTRY &&